From 47a3122a140426a464b95cd1d546c123f6d8fc06 Mon Sep 17 00:00:00 2001
From: robertlipe <robertlipe@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Tue, 31 Dec 2013 19:20:31 +0000
Subject: [PATCH] Fix zlib, warning tweaks.

---
 gpsbabel/gbfile.cc  | 5 +++--
 gpsbabel/gbfile.h   | 2 +-
 gpsbabel/nmn4.cc    | 4 +++-
 gpsbabel/vitovtt.cc | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/gpsbabel/gbfile.cc b/gpsbabel/gbfile.cc
index e24531e0e..d417e15e1 100644
--- a/gpsbabel/gbfile.cc
+++ b/gpsbabel/gbfile.cc
@@ -21,6 +21,7 @@
  */
 
 #include "defs.h"
+#include "zconf.h"
 #include "gbfile.h"
 
 #include <assert.h>
@@ -85,9 +86,9 @@ gzapi_open(gbfile* self, const char* mode)
       fd = stdout;
     }
     SET_BINARY_MODE(fd);
-    self->handle.gz = (void**)gzdopen(fileno(fd), openmode);
+    self->handle.gz = gzdopen(fileno(fd), openmode);
   } else {
-    self->handle.gz = (void**)gzopen(self->name, openmode);
+    self->handle.gz = gzopen(self->name, openmode);
   }
 
   if (self->handle.gz == NULL) {
diff --git a/gpsbabel/gbfile.h b/gpsbabel/gbfile.h
index 15ff911b4..217de1ef0 100644
--- a/gpsbabel/gbfile.h
+++ b/gpsbabel/gbfile.h
@@ -55,7 +55,7 @@ typedef struct gbfile_s {
     FILE* std;
     unsigned char* mem;
 #if !ZLIB_INHIBITED
-    gzFile* gz;
+    gzFile gz;
 #endif
   } handle;
   char*   name;
diff --git a/gpsbabel/nmn4.cc b/gpsbabel/nmn4.cc
index 4e039fac1..ff70b316b 100644
--- a/gpsbabel/nmn4.cc
+++ b/gpsbabel/nmn4.cc
@@ -48,7 +48,8 @@ arglist_t nmn4_args[] = {
 
 
 /* helpers */
-
+#if NEW_STRINGS
+#else
 static char*
 nmn4_concat(const char* arg0, ...)
 {
@@ -77,6 +78,7 @@ nmn4_concat(const char* arg0, ...)
 
   return res;
 }
+#endif
 
 static void
 nmn4_check_line(char* line)
diff --git a/gpsbabel/vitovtt.cc b/gpsbabel/vitovtt.cc
index 786a51d13..b87a358be 100644
--- a/gpsbabel/vitovtt.cc
+++ b/gpsbabel/vitovtt.cc
@@ -38,8 +38,8 @@ static gbfile*			infile	= 0;
 static int				count	= 0;
 
 static const int			vitovtt_version				= 3;
-static const size_t			vitovtt_headersize			= 16;
-static const size_t			vitovtt_datasize			= 32;
+// static const size_t			vitovtt_headersize			= 16;
+// static const size_t			vitovtt_datasize			= 32;
 
 static const double			vitovtt_latitudescale		= 20000000.0;
 static const double			vitovtt_longitudescale		= 10000000.0;
-- 
2.30.2